Blame Trees

نویسندگان

  • Erik D. Demaine
  • Pavel Panchekha
  • David A. Wilson
  • Edward Z. Yang
چکیده

We consider the problem of merging individual text documents, motivated by the single-file merge algorithms of document-based version control systems. Abstracting away the merging of conflicting edits to an external conflict resolution function (possibly implemented by a human), we consider the efficient identification of conflicting regions. We show how to implement tree-based document representation to quickly answer a data structure inspired by the “blame” query of some version control systems. A “blame” query associates every line of a document with the revision in which it was last edited. Our tree uses this idea to quickly identify conflicting edits. We show how to perform a merge operation in time proportional to the sum of the logarithms of the shared regions of the documents, plus the cost of conflict resolution. Our data structure is functional and therefore confluently persistent, allowing arbitrary version DAGs as in real version-control systems. Our results rely on concurrent traversal of two trees with short circuiting when shared subtrees are encountered.

برای دانلود متن کامل این مقاله و بیش از 32 میلیون مقاله دیگر ابتدا ثبت نام کنید

ثبت نام

اگر عضو سایت هستید لطفا وارد حساب کاربری خود شوید

منابع مشابه

The effectiveness of mindfulness-based education on self-blame and working memory in adolescents

The aim of this study was to investigate the effect of mindfulness-based education on two structures related to cognition, namely self-blame and working memory in adolescents. The research design was quasi-experimental with a control group. Participants included 30 people (two groups of 15 people) from adolescents aged 14 to 18 years who volunteered to participate in the study. They responded t...

متن کامل

Behavioral and characterological self-blame in chronic obstructive pulmonary disease.

OBJECTIVE To assess behavioral and characterological self-blame, identify demographic and relational correlates of self-blame, and determine the association of self-blame with psychological and clinical outcomes of chronic obstructive pulmonary disease (COPD). METHODS Data were collected via self-report questionnaires completed by 398 individuals with COPD who had at least a 10 pack-year hist...

متن کامل

A Theory of Blame

We introduce a theory of blame in five parts. Part 1 addresses what blame is: a unique moral judgment that is both cognitive and social, regulates social behavior, fundamentally relies on social cognition, and requires warrant. Using these properties, we distinguish blame from such phenomena as anger, event evaluation, and wrongness judgments. Part 2 offers the heart of the theory: the Path Mod...

متن کامل

Not so bad after all? The role of explanation features in blame mitigation

Previous work on the role of explanations in blame mitigation used an outdated distinction between “person” and “situation” causes and examined which causes better excuse a negative behavior. This approach fails with intentional behaviors, which are explained by reasons, not causes. A recent model of blame (Malle, Guglielmo, & Monroe 2012) suggests that reason explanations function as justifica...

متن کامل

On the prospects for a blame-free medical culture.

Official policy-making bodies and experts in medical error have called for a shift in perspective to a blame-free culture within medicine, predicated on the basis that errors are largely attributable to systems rather than individuals. However, little is known about how the lived experience of blame in medical care relates to prospects for such a shift. In this essay we explore the benefits and...

متن کامل

ذخیره در منابع من


  با ذخیره ی این منبع در منابع من، دسترسی به آن را برای استفاده های بعدی آسان تر کنید

برای دانلود متن کامل این مقاله و بیش از 32 میلیون مقاله دیگر ابتدا ثبت نام کنید

ثبت نام

اگر عضو سایت هستید لطفا وارد حساب کاربری خود شوید

عنوان ژورنال:

دوره   شماره 

صفحات  -

تاریخ انتشار 2013